(describe-char): Check font-object by fontp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca787cfcd2ddde9b7ca8adeeafb6b03914e031e2..944b55c47e735c35a44a94f3ee095d37eb20ee7d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-04  Kenichi Handa  <handa@m17n.org>
+
+       * descr-text.el (describe-char): Check font-object by fontp.
+
+       * composite.el (compose-gstring-for-terminal): If a character is
+       not supported by the current terminal, don't make a multi-glyph
+       grapheme cluster.
+       (auto-compose-chars): Check font-object by fontp.
+
 2009-02-03  Glenn Morris  <rgm@gnu.org>
 
        * mail/unrmail.el (unrmail): In the absence of Mail-from, prefer Date

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 96ef2458e4240cc45abe6ebcd511f55c97611018..89325cca22ae942bdda148b75d8a2578184eaeb0 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -630,7 +630,7 @@ as well as widgets, buttons, overlays, and text properties."
                     (nglyphs (lgstring-glyph-len gstring))
                     (i 0)
                     glyph)
-               (if font
+               (if (fontp font)
                    (progn
                      (insert " using this font:\n  "
                              (symbol-name (font-get font :type))